Change in openvpn[master]: ssl_openssl: Clean up unused functions and add missing "static"
A message that is not in the archive (sent off-list or not yet received): gerrit.1736858059000.Ifa06a3cb843dbf6a9639164d12aabe572aab162c@...2715...
Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/860?usp=email
to review the following change.
Change subject: ssl_openssl: Clean up unused functions and add missing "static"
......................................................................
ssl_openssl: Clean up unused functions and add missing "static"
Just some misc cleanups found while looking at the code.
---
M src/openvpn/ssl_backend.h
M src/openvpn/ssl_mbedtls.c
M src/openvpn/ssl_openssl.c
3 files changed, 5 insertions(+), 50 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/60/860/1
src/openvpn/ssl_backend.h +3 -9
@@ -529,12 +529,12 @@* ***************************************/ -/* +/** * Print a one line summary of SSL/TLS session handshake. */ void print_details (struct key_state_ssl *ks_ssl,const char *prefix); -/* +/** * Show the TLS ciphers that are available for us to use in the * library depending on the TLS version. This function prints * a list of ciphers without headers/footers.
@@ -549,17 +549,11 @@const char *tls_cert_profile, bool tls13); -/* +/** * Show the available elliptic curves in the crypto library */ void show_available_curves (void ); -/* -* The OpenSSL library has a notion of preference in TLS ciphers. Higher -* preference == more secure. Return the highest preference cipher. -*/ -void get_highest_preference_tls_cipher (char *buf,int size); -/** * return a pointer to a static memory area containing the * name and version number of the SSL library in use
src/openvpn/ssl_mbedtls.c +0 -14
@@ -1585,20 +1585,6 @@ } } -void -get_highest_preference_tls_cipher (char *buf,int size) -{ -const char *cipher_name; -const int *ciphers =mbedtls_ssl_list_ciphersuites (); -if (*ciphers ==0 ) - { -msg (M_FATAL ,"Cannot retrieve list of supported SSL ciphers." ); - } - - cipher_name =mbedtls_ssl_get_ciphersuite_name (*ciphers); -strncpynt (buf, cipher_name, size); -} -const char *get_ssl_library_version (void ) {
src/openvpn/ssl_openssl.c +2 -27
@@ -354,7 +354,7 @@return true; } -void +static void convert_tls_list_to_openssl (char *openssl_ciphers,size_t len,const char *ciphers) {/* Parse supplied cipher list and pass on to OpenSSL */
@@ -461,7 +461,7 @@ } } -void +static void convert_tls13_list_to_openssl (char *openssl_ciphers,size_t len,const char *ciphers) {
@@ -2638,31 +2638,6 @@#endif /* ifndef OPENSSL_NO_EC */ } -void -get_highest_preference_tls_cipher (char *buf,int size) -{ -SSL_CTX *ctx; -SSL *ssl; -const char *cipher_name; - - ctx =SSL_CTX_new (SSLv23_method ()); -if (!ctx) - { -crypto_msg (M_FATAL ,"Cannot create SSL_CTX object" ); - } - ssl =SSL_new (ctx); -if (!ssl) - { -crypto_msg (M_FATAL ,"Cannot create SSL object" ); - } - - cipher_name =SSL_get_cipher_list (ssl,0 ); -strncpynt (buf, cipher_name, size); - -SSL_free (ssl); -SSL_CTX_free (ctx); -} -const char *get_ssl_library_version (void ) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/860?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ifa06a3cb843dbf6a9639164d12aabe572aab162c
Gerrit-Change-Number: 860
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/860?usp=email )
Change subject: ssl_openssl: Clean up unused functions and add missing "static"
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/860?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ifa06a3cb843dbf6a9639164d12aabe572aab162c
Gerrit-Change-Number: 860
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Tue, 14 Jan 2025 16:49:08 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH 1/1 ssl_openssl: Clean up unused functions and add missing "static"
In reply to a message not in the archiveFrom: Frank Lichtenheld <[email protected]...>
Just some misc cleanups found while looking at the code.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/860
This mail reflects revision 1 of this Change.
Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
src/openvpn/ssl_backend.h +3 -9
@@ -529,12 +529,12 @@* ***************************************/ -/* +/** * Print a one line summary of SSL/TLS session handshake. */ void print_details (struct key_state_ssl *ks_ssl,const char *prefix); -/* +/** * Show the TLS ciphers that are available for us to use in the * library depending on the TLS version. This function prints * a list of ciphers without headers/footers.
@@ -549,17 +549,11 @@const char *tls_cert_profile, bool tls13); -/* +/** * Show the available elliptic curves in the crypto library */ void show_available_curves (void ); -/* -* The OpenSSL library has a notion of preference in TLS ciphers. Higher -* preference == more secure. Return the highest preference cipher. -*/ -void get_highest_preference_tls_cipher (char *buf,int size); -/** * return a pointer to a static memory area containing the * name and version number of the SSL library in use
src/openvpn/ssl_mbedtls.c +0 -14
@@ -1585,20 +1585,6 @@ } } -void -get_highest_preference_tls_cipher (char *buf,int size) -{ -const char *cipher_name; -const int *ciphers =mbedtls_ssl_list_ciphersuites (); -if (*ciphers ==0 ) - { -msg (M_FATAL ,"Cannot retrieve list of supported SSL ciphers." ); - } - - cipher_name =mbedtls_ssl_get_ciphersuite_name (*ciphers); -strncpynt (buf, cipher_name, size); -} -const char *get_ssl_library_version (void ) {
src/openvpn/ssl_openssl.c +2 -27
@@ -354,7 +354,7 @@return true; } -void +static void convert_tls_list_to_openssl (char *openssl_ciphers,size_t len,const char *ciphers) {/* Parse supplied cipher list and pass on to OpenSSL */
@@ -461,7 +461,7 @@ } } -void +static void convert_tls13_list_to_openssl (char *openssl_ciphers,size_t len,const char *ciphers) {
@@ -2638,31 +2638,6 @@#endif /* ifndef OPENSSL_NO_EC */ } -void -get_highest_preference_tls_cipher (char *buf,int size) -{ -SSL_CTX *ctx; -SSL *ssl; -const char *cipher_name; - - ctx =SSL_CTX_new (SSLv23_method ()); -if (!ctx) - { -crypto_msg (M_FATAL ,"Cannot create SSL_CTX object" ); - } - ssl =SSL_new (ctx); -if (!ssl) - { -crypto_msg (M_FATAL ,"Cannot create SSL object" ); - } - - cipher_name =SSL_get_cipher_list (ssl,0 ); -strncpynt (buf, cipher_name, size); - -SSL_free (ssl); -SSL_CTX_free (ctx); -} -const char *get_ssl_library_version (void ) {
[Openvpn-devel] [PATCH applied] Re: ssl_openssl: Clean up unused functions and add missing static
Indeed, unused functions, and not called from anywhere - so ACK (in gerrit).
Your patch has been applied to the master branch.
commit 758d28122954a30102f44b49e43f4b950553448a
Author: Frank Lichtenheld Date: Tue Jan 14 17:49:38 2025 +0100
ssl_openssl: Clean up unused functions and add missing static
Signed-off-by: Frank Lichtenheld <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg30453.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/860?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by cron2
Change subject: ssl_openssl: Clean up unused functions and add missing "static"
......................................................................
ssl_openssl: Clean up unused functions and add missing "static"
Just some misc cleanups found while looking at the code.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg30453.html
---
M src/openvpn/ssl_backend.h
M src/openvpn/ssl_mbedtls.c
M src/openvpn/ssl_openssl.c
3 files changed, 5 insertions(+), 50 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/60/860/2
src/openvpn/ssl_backend.h +3 -9
@@ -529,12 +529,12 @@* ***************************************/ -/* +/** * Print a one line summary of SSL/TLS session handshake. */ void print_details (struct key_state_ssl *ks_ssl,const char *prefix); -/* +/** * Show the TLS ciphers that are available for us to use in the * library depending on the TLS version. This function prints * a list of ciphers without headers/footers.
@@ -549,17 +549,11 @@const char *tls_cert_profile, bool tls13); -/* +/** * Show the available elliptic curves in the crypto library */ void show_available_curves (void ); -/* -* The OpenSSL library has a notion of preference in TLS ciphers. Higher -* preference == more secure. Return the highest preference cipher. -*/ -void get_highest_preference_tls_cipher (char *buf,int size); -/** * return a pointer to a static memory area containing the * name and version number of the SSL library in use
src/openvpn/ssl_mbedtls.c +0 -14
@@ -1585,20 +1585,6 @@ } } -void -get_highest_preference_tls_cipher (char *buf,int size) -{ -const char *cipher_name; -const int *ciphers =mbedtls_ssl_list_ciphersuites (); -if (*ciphers ==0 ) - { -msg (M_FATAL ,"Cannot retrieve list of supported SSL ciphers." ); - } - - cipher_name =mbedtls_ssl_get_ciphersuite_name (*ciphers); -strncpynt (buf, cipher_name, size); -} -const char *get_ssl_library_version (void ) {
src/openvpn/ssl_openssl.c +2 -27
@@ -354,7 +354,7 @@return true; } -void +static void convert_tls_list_to_openssl (char *openssl_ciphers,size_t len,const char *ciphers) {/* Parse supplied cipher list and pass on to OpenSSL */
@@ -461,7 +461,7 @@ } } -void +static void convert_tls13_list_to_openssl (char *openssl_ciphers,size_t len,const char *ciphers) {
@@ -2638,31 +2638,6 @@#endif /* ifndef OPENSSL_NO_EC */ } -void -get_highest_preference_tls_cipher (char *buf,int size) -{ -SSL_CTX *ctx; -SSL *ssl; -const char *cipher_name; - - ctx =SSL_CTX_new (SSLv23_method ()); -if (!ctx) - { -crypto_msg (M_FATAL ,"Cannot create SSL_CTX object" ); - } - ssl =SSL_new (ctx); -if (!ssl) - { -crypto_msg (M_FATAL ,"Cannot create SSL object" ); - } - - cipher_name =SSL_get_cipher_list (ssl,0 ); -strncpynt (buf, cipher_name, size); - -SSL_free (ssl); -SSL_CTX_free (ctx); -} -const char *get_ssl_library_version (void ) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/860?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ifa06a3cb843dbf6a9639164d12aabe572aab162c
Gerrit-Change-Number: 860
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/860?usp=email )
Change subject: ssl_openssl: Clean up unused functions and add missing "static"
......................................................................
ssl_openssl: Clean up unused functions and add missing "static"
Just some misc cleanups found while looking at the code.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg30453.html
---
M src/openvpn/ssl_backend.h
M src/openvpn/ssl_mbedtls.c
M src/openvpn/ssl_openssl.c
3 files changed, 5 insertions(+), 50 deletions(-)
src/openvpn/ssl_backend.h +3 -9
@@ -529,12 +529,12 @@* ***************************************/ -/* +/** * Print a one line summary of SSL/TLS session handshake. */ void print_details (struct key_state_ssl *ks_ssl,const char *prefix); -/* +/** * Show the TLS ciphers that are available for us to use in the * library depending on the TLS version. This function prints * a list of ciphers without headers/footers.
@@ -549,17 +549,11 @@const char *tls_cert_profile, bool tls13); -/* +/** * Show the available elliptic curves in the crypto library */ void show_available_curves (void ); -/* -* The OpenSSL library has a notion of preference in TLS ciphers. Higher -* preference == more secure. Return the highest preference cipher. -*/ -void get_highest_preference_tls_cipher (char *buf,int size); -/** * return a pointer to a static memory area containing the * name and version number of the SSL library in use
src/openvpn/ssl_mbedtls.c +0 -14
@@ -1585,20 +1585,6 @@ } } -void -get_highest_preference_tls_cipher (char *buf,int size) -{ -const char *cipher_name; -const int *ciphers =mbedtls_ssl_list_ciphersuites (); -if (*ciphers ==0 ) - { -msg (M_FATAL ,"Cannot retrieve list of supported SSL ciphers." ); - } - - cipher_name =mbedtls_ssl_get_ciphersuite_name (*ciphers); -strncpynt (buf, cipher_name, size); -} -const char *get_ssl_library_version (void ) {
src/openvpn/ssl_openssl.c +2 -27
@@ -354,7 +354,7 @@return true; } -void +static void convert_tls_list_to_openssl (char *openssl_ciphers,size_t len,const char *ciphers) {/* Parse supplied cipher list and pass on to OpenSSL */
@@ -461,7 +461,7 @@ } } -void +static void convert_tls13_list_to_openssl (char *openssl_ciphers,size_t len,const char *ciphers) {
@@ -2638,31 +2638,6 @@#endif /* ifndef OPENSSL_NO_EC */ } -void -get_highest_preference_tls_cipher (char *buf,int size) -{ -SSL_CTX *ctx; -SSL *ssl; -const char *cipher_name; - - ctx =SSL_CTX_new (SSLv23_method ()); -if (!ctx) - { -crypto_msg (M_FATAL ,"Cannot create SSL_CTX object" ); - } - ssl =SSL_new (ctx); -if (!ssl) - { -crypto_msg (M_FATAL ,"Cannot create SSL object" ); - } - - cipher_name =SSL_get_cipher_list (ssl,0 ); -strncpynt (buf, cipher_name, size); - -SSL_free (ssl); -SSL_CTX_free (ctx); -} -const char *get_ssl_library_version (void ) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/860?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ifa06a3cb843dbf6a9639164d12aabe572aab162c
Gerrit-Change-Number: 860
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged